Refactoring itests