adjust relevant tests (and a few less relevant tests too). all passing with high mocha --timeout e.g. 40000