All things was fixed. Added test 016. Ready for next CR