Moderate/URIcomparison initial checkin (with test files)