IT test and some unit test refactorings