Add Singleton pattern to DB connection & more DB tests