Use package:uri
Use more quiver
Test cleanup