v1.0.3 - Refactor specs