Add tests for #88