here separate map to mapForTests and mapForSessionScope. In this case you will not need filtering with remove()