sort expectations to match params