Refactor specs to make better spec output