Most tests running.
Revert default display_name to None

Change a lot of tests to no longer use templates.
Add some safety code and clarify some var names.