Reorganization of themes tests