ignoring more local postgres stuff
tests refactored