composite/enum test code refactor
adding aggregate functions support