Related to #555 , take any tests that are marked unit tests but actually aren't, and see if we can mock out the external dependencies.