Adding more tests to Issue #326