Issue #434 add more tests