Upgraded to use Base.extend

and some test refactoring.

 Changes:

 5531664 (Revath S Kumar, 15 minutes ago)
    Refactoring tests

 fb50fc2 (Revath S Kumar, 5 weeks ago)
    Using class-extend