Refactor specs for clarity