Verified tests working with  fix =)