Integration tests code cleanup