Tweaking the algorithm.

I think this is the best I can do for skipping initial tests.