Refactor some more reactive tests