Fix tests etc.