Fix up the test generator and tests so they work properly