Fix tests - now all 7096 checks pass