Mocha test cases for Travis, database changes to match