Fix typo
Merge pull request #6926 from jacksontj/develop

Fix typo
Fix #6764
Fix missing import
One more missing import
Skip this test until properly mocked.