Added a few additional unit tests (no new issues found)