cleaned up Database and DatabaseTest