Merge "Add tests for attribute resolution"