TAA-2: Implemented remianing unit tests for Uri matcher and begun implementing content resolver