Added comments to Handler test and made it somewhat compliant