Adapting to new expecta syntax