Update tests to match latest implementation