Minor clean-up in test cases: Long term goal: phy/test/data contains unit tests, but they are organised such that we can symlink folders into src/test/... and perform integration test on the same files.