Remove database argument
Fix travis_run_tests usage
Merge branch 'master' into consolidated