More test fixing.
Move whole directory rather than one file.