Shrawan : Making some refactoring changes and adding Junits