forgot to add the tests (fix #693, fix #695)