re-enable uri test and add a few more