Fix tests etc