Switched tests to something less invasive.
Removed one of two global attribute that stored the same information.