Update to new expectation syntax (thanks transpec)