Fix tests once and for all?