Convert more tests, including a method to skip on ImportError