redundant classes and tests removed
redundant classes and tests removed