Cosmetic changes for _TEST_ mode