Adding junit unit tests