Switched back to original travis-ci tests and disabled multi-threaded db tests