Refactor angles spec