Tidy up + local DB connection added to test config