Minor refactoring on IT tests