improved unit tests related to collection handler