Issue 62 refactor specs