Contact Forms: Consistent subject filter calls.

Add the field name to value array to the other subject filter application for consistency.
Contact Forms: Tests add token replacement hook.

Tests now account for the new placement of the subject token replacement hook addition.