Add tests for #13