please add tests from this issue