Some more TestDriver tests for the new functionality. Now have two sets
of tests for everything