themes handling for tests reworked