Fix typos after renaming a class
Temporarily skip tests that require unreleased features