fix tests + switched to enumset