Makes better use of the google test framework