Little refactoring of specs