Get tests working again