Fix setattr ambuigity resolution
Optimization
More tests
Prepared change for group with single env to be less spacific then env TODO