Don't depend on a test file; this class can't run anyway.
Correct class names(how did this escape so long?)
More missing APIs