hspec test hierarchy preserved
update for hspec-1.11
updated haddocks