Fixed some mock generator test problems.