Fix tests
Rename