Fix tests [2]