Getting ready for database submission/tests