Extensions of instances.hs changed
Testing stuff moved
URI building refactored