Refactor some of tests so they are either skipped or passed in 11.6
Refactor some of tests so they are either skipped or passed in 11.6