Changed some names in the tests