update testbase with internal tests and ensuring methods return class isntances