Fix specs to follow changes from last commit