Modified some tests to have optional IRIs