Unit setting and test mode setting Backbone tweaks

Wasn't being used.