handler unit tests updated