Fix tests (should API change)