tests/calc/disagg_test:

Fixed broken tests and updated expected results where necessary.