Continued implmenting methods for unnit tests
Added methods to use in other classes and continued implement unit tests