Fix tests (one failing, tough)