Update more tests to use new import syntax.