* Fix intermittently failing tests, mostly increasing timeout

Fix several unit tests that are intermittently failing. All fixes
involve increasing timeouts. Adjusted formatting in several areas within
updated tests.

* Remove formatting/refactoring from previous commit

Superfluous formatting and refactoring was making review impossible.