removing whitespace/general cleanup
tests now point to test db