The file rename is broke after #425 (known regression).

PS: Also fix the tests that are currently skipped.