Simplified naomi test - moved most logic to database test under #constructor().