Fixed issues in a test that arose from refactoring.