Refactored gtests