Add tests for GH-29