Refactor specs in preparation for v0.4.0