Mohit | Rectified Previous commit and Updated tests