Adding average function, fix filter generator bug
updating test case for average function
Fix map generator bug

Refresh generator of map
Adding generic average function, contains function
Adding count function
Adding distinct function