Changing tests for messaging change; fixing filter change callbacks for new format