fixed build with latest changes from joliver eventstore, fixed specs related to decorator
adding tests for decorator
added tests
Merge branch 'get-upconverted-events'