spec fixes and changes to spec_helper