Refactored gtest things