TST: more work towards the two-layer expectation test