Passing all old tests with singleton DB
Begin moving task methods into DB, passing relevant tests