Made monitor test a bit better