Reorg the test dir. Start on tests for IRI expansion.