Refactored the disaggregation test
Now the tests run again