minor spec refactoring and restart added