fixed tests for sample app refactoring, refs #998