NoSuchElementException fixed
#SCL-7146 fixed
test fixed