Testing fixups

The tests were still failing because of a few other imports, so this fixes those up. These tests are really broken.