Test refactoring
Fix to DB connection issue