Fix broken imports that slipped through the tests.
Merge pull request #2042 from tklein23/fixing_broken_imports

Fix broken imports that slipped through the tests.