Minor changes
Increased mocha timeout for Travis CI