Replaced DatabaseTest with generic CRUDTest