Now using gtest + cleaned all the tests