Restored old Xtension interface and tests.