Because of monitor changes, the test had wrong assumptions. Renamed the test and updated it to use MaxCtrl for some queries. Also, changed the type of the cycle container in the monitor to an ordered map so that results are predictable.
