Merge "Add more testing attribute debugging."