Fix tests (II)