All tests passing and refactored cell parameters