Refactored TearDownAttributeConverter and TestAttributeConverter