Simplified the unit test directory structure.