tests working locally with postgres
fixing test
Merge branch 'master' into gh-pages