Fixed compile-time error, now have link-order error

This fixed previous problem.  Now, as expected, linker is complaining
about the two definitions of Galaxy.  Link-time mocking...sucks. I'll
see if I can get it working, so change to GMock is a refactoring not a
hack.