The classes were renamed in 9bf39163, this updates the test cases to match. Also take care of XCF while we're at it too. Change-Id: Iaaeee93e496af6cdd610df5bc75302ecfe273f64
9bf39163