Fix #51 update unit tests; use single expectation
Merge pull request #52 from jhx/issue_51_update_unit_tests_single_expectation

Fix #51 update unit tests; use single expectation