Convert DB class to singleton, fail most tests now