Updated spec to new syntax and disabled the old one