Tests almost working again...