Updated UT script and one extra test