update
Updated with Junit Tests