Fixed overwritten testcases