Fix #59 update unit tests; use single expectation
Merge pull request #60 from jhx/issue_59_update_unit_tests_single_expectation

Fix #59 update unit tests; use single expectation