testing cleanup, adding iris basedtests