Fix tests using stereotypes