REVIEW: Legacy ITs improvements

See commits for details about work done