Clean up remaining import errors in test suite