Refactored specs
more specs refactorying