Refactor specs to use short syntax