Updated URI field names
Fixed method calls
A little update to the test class