fixed integrationTests and created Exception Wrapper class
fixed some merge conflicts