Refactored attr test classes