Much faster test 50s to 3s. At the beggining of this PR it was 67s.