Increased the timeouts for the tests.

Overall timeout length is 10s. For the few tests that take longer than 10s, their timeouts have been individually set to 15s.