Data Drive InPlace tests - fixed code review comments