Merged in cellinfo changes and updated generateTests()