Fix refactoring artifacts that cause test bundle build to fail.