Fix test result
Modify assignment in order to return full hash
Remove duplicated filtering