Issue #285 add more tests