Grand refactoring des specs, fixes #159