added support for test-environment, fixed model-attribute-access