Unit setting and test mode setting Backbone tweaks