Add fix to tests