Refactor tests + decleanify + matchers for change(set)