Increasing test-suite spread. Moving toward increasing number of tests also.
Upped mocha timeout to ten seconds, since some of the tests can take some time to complete if the network is bad.