Add new tests for match code and updated for monitor format.
Rule matching tested and passing