Add tests for tracking non-field attributes