refactored specs so they are all green