Restructure test classes to match production structure, no more JFormInspector