Integrated appCatalog for ssh and gsi modules, commented out old test classes, need to fix this