refactored checking for attributes, new update method, re-enabled
integration test