Fix the test modules' namespaces
Change utils/mode-switcher to convert the given mode number to an int