Fix tests, clean code