updated structure added URI tests