Monitors

Final monitors refactor and test clean up.