Fix tests 1404