fixed tests/code to get tests passing again, refs #158