Minor refactoring of the specs