Update import statements in unit tests.
Update integration tests for new classes.