switching to google test
cleaning up some code