Refactor Scope
Fix tests for association
Fix messages for remove, replace callbacks