Fix tests
Clean