Fix tests (2)