KAZOO-1104: fix busted rebase, and update specs