Add tests for COOK-2045, COOK-2121