HOTFIX fixed test for HOTFIX + renaming for better understanding