Fixed issues with toString and union aggregations,, beatufied output as well. Moved test file into test source tree.