Add more unit tests of aggregate function, remove call to API
Add more unit tests of aggregate function, remove call to API

googleinterns/sgonks,googleinterns/sgonks,googleinterns/sgonks,googleinterns/sgonks