Fix tests to avoid ambiguities