Fix up limits on associations, modernize cpk predicates.
Fix up test of or predicate.
Don't set id as attribute.
Fix test name.
Rearrange code a bit.
Remove some dead code.