WIP switching to "skip" form

re-enabled some test lines that still apply