Little spec refactory. Added more options