A bit of refactoring of the specs