Fix tests 1