slight changes to tests to make them more reliable; bump mocha timeout