cleaned pending specs
refactored shoulda spec in discipline