database integrity verified for new schema and unittests fixed