Fix tests. Immo on singu fail. Yoink targets