Overhaul test schema