Cleaned up import style in tests.