Refactor the tests a little bit
Fix compilation of IrminQueue