Fix #51 update unit tests; use single expectation