- Stop failing on config file load, use the validation in the test config stuff.
* Fix Upsert hooks * Rename singleton template files