Revamped the Uris used for Content Provider. Almost done with insert. Some environment uri inserts are left. Updated test cases appropriately.