Throws spec refactored