set definition fixes + test