Eliminated duplicate test class