Vastly simplify the test schema; this all gets tested elsewhere