Finished Sphere integration tests and cleanup up some garbage.