Backbone test fixes

Some fixes brought  up by backbone testing on ampersand-model