Change TableCell* and TableCell*Test