Fix monitor unit tests