Revert --old-and-unmanagable experiment
Remove tests that weren't there previously