Cleaning up tests, reversing to schema only generation.