Further reduce Paladin costs for PB7 CSW/CMW.  Thanks PowerWyrm for the suggestion.
Fix up tests