DRY out using spec_helper.js
cleanup and more specs.