adjusted tests to latest refactorings, refs #915