fixed tests, refs #113 and #114