Add tests for #32