Minor test cleanup: skipif tests that require optional dependencies, migrate unittest skipif to pytest, minor import/typing clean up

Minor test cleanup: skipif tests that require optional dependencies, migrate unittest skipif to pytest, minor import/typing clean up #2435