More minor changes
Cleanup and correct build files for tests to use local build directory for classes
minor corrections