Fixing naming typo in the control unit
Removing unused code
Commenting some tests to make them more readable