Fixed async tests
Removed references to dart:uri and added some simple fixes