Started creating testcases for istrcpy, istrncpy
fixed merge conflict