GPII-20: Linted integration tests and did some cleaning based on yzen's comments