changed netkat types to distinguish between pred and pol, ala KAT
changed netkat types to distinguish between pred and pol, ala KAT
merge, updated tests for post-merge world