more action spec refactoring