Update specs to new syntax as well