Route expect tests, tweaks to Firewall as well, and actually handling json comparison type.