refactored specs a bit