added more uri tests; clean up