ifrit cleanup

refactoring around the ifrit switch, + bump timeout in one of the refactored tests