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

Fix #58 update unit tests; use single expectation