Retested control unit successfully.
Retested successfully (with addition of mock event listeners to classes that use them.
Updated tests to reflect change from hexadecimal to decimal format in toString() method.
Added dummy listener to avoid null pointers during testing.