Fix tests and remove final