Merge "Fix class name for test extensions"