fixed tests to compile; cleaned up gtest project to include gtest cmake file