Fix them tests