Added unit and integration Tests