fix unit tests;
clean up unit test data dirs.