Gtest works, Cleaned it up also