Refactored Test Classes