Converted a TODO into a pending test.
Added class name.
Setting up to fill in missing predicates.
Sharing a few predicates.