tests fixed , mock renamed