improving monitoring unit tests