fixed tests, refs #112 and #113