Finished changes for test dir paths.
Disabled remaining tests..