055: Added junit tests