Removed task modules retained for backwards compatibility.
Make monitor test less suspectible to minor 1 second timing differences.