test reorganization/rename, cmd test also uses json