Fix #46 update unit tests; use single expectation