Fixed tests after refactoring. refs #454