Moved a whole bunch of tests
More moving tests around
Added extra print in tester