Little fixes
Little specs refactoring