Modifies test_tenant to validate flow filling better