Switching the common attribute over to using the generic diagnostic, and removing the now-unused diagnostic. Updates a test case.