Tidied up opportunistic task tests.