Refactor specs for readability