cleanup
added tests for database validation