Unit test was added for HslSupperClassHandler.
Minor clean up.