Fix tests

#5289