More refactoring and new IT tests