Update tests
Update format (next iteration).
Revert name change.

This seems to cause a strange DIC compile issue. Reverting for now.