Added Cell Class & Tests