Using GTest - resolves #2