Lazy decoding of cells and Test cases cleanup