Reworked skip-download and rspec to not touch downloads