Fix #58 update unit tests; use single expectation