Added SkipUntil + tests