fixing another mistake and adding some retest cases