added spec_helper; polished shuffler