Updates for tests to match new rules

Pre_entitlement rules now include manifest consumers. This blocked a few things that were allowed before.
Also an issue or 2 with distributor version mantainence.