Cleaning up non-deterministic activity tests