added tests. refs #556