Merge "Convert to use tempest attr implementation 2/2"