Smarter skip logic and add test.
More realistic smart skip test.