Fix tests using other types than int