Added Cell and tests