Add tests for #29