Adding a couple of unit tests
Small changes
Adding more asserts to Aggregate bolt IT