Fix #69 update unit tests; use single expectation