Fixed specs broken by branch splitting