Tweaks to monitor tests