Include GMock

Refactor to use ASSERT_THAT and add additional base test