Build cleanup, gtest integration
Cleaned up build environment