Jbide 18119 tests for 17919

@adietish The tests split to a separate pull request