Add tests for #3225