Overhaul

Octavians stuff for google tests, look at the wiki page for a description of it in more detail.