Refactor specs a bit