fix remarks by @JensTimmerman, add unit test for --skip