Fix #69 update unit tests; use single expectation
Merge pull request #70 from jhx/issue_69_update_unit_tests_single_expectation

Fix #69 update unit tests; use single expectation