added fix for attributes and changed mocks