Made test timinigs more forgiving