Update unit tests from PR #2