improved monitor tests