Unit setting and test mode setting Backbone tweaks

This was never used.