Fix #59 update unit tests; use single expectation