Fix tests (lost commit)