Fix tests 2