Tweaking monitor test - including wait_for_timeout