The timeouts were a bit too demanding and increasing them should lower the rate of false positives.
Added tests from develop. The test results need to be modified for 2.0.
