Mash Maketest.py into single_test.py, which now does contents tests!