Merge pull request #248 from TheBlueMatt/2018-11-monitor-test-split