Combinetests

This branch contains updated versions of the tests that are all contained in a single executable.