Updated db schema, ready for test