refactored specs, and tweaks to helpers