Revert testing logic consolidation.

It is used for form-specific testing at times.