Tidy up db schema and resulting test.