Compiles again after dart:uri removal

Dart changed and removed dart:uri.  Project compiles & tests again after import removed.