Issue #434 add more tests
Issue #434 add more tests