Extract testable logic from Expand & Collapse Feature into model level for testing

To improve testing of the expand and & collapse features, testable fragments should be extracted and moved into the model layer. There they should then be tested.