Refactored Army and Cell; removed outdated tests