Clean up specs and convert expectations to new syntax