Cleaned up some of the tests for more consistency and better async management.