Merge "Cleanup BaseMonitor unit tests"