cleaned up the unit test files a bit