Hacking 4.6 fixbugs part two

Other fixes and additional tests for client policy and inconsistency.