Fixing specs after rebasing