Fix tests and simplify implementation
Add tests for the skip feature