Updated with tests

Added jUnit4 Tests