Fleshed out the test schema a bit.