Make the tests cleaner by using helper header files; the tests that don't do anything now fail