Updated cf template for test user.
It's passing now.
Cleanups.