partial fix

- tests for Issue #216, Issue #223, and Issue #245