update to match latest backbone
add backbone tests