deepak,praveen|refactoring tests