Small backbone refactors. Fixed test coverage