making all working tests work here (872/876)