refactored specs to use new specHelper features, and to be better tests