committing final changes

Added Junit Testing, Assert statements within code and improved coding
conventions & readability.