Added testing for  functionality in