WIP commit for unit testing and cell sizing fixes