Fixed endless loop while running the whole suite of tests