refactor all tests to use mark instead of generator skips