some code clean up

the tests are not done on the user's db