Enhancing test for changes in 15.16.2