Fix bugs after Docker and TestNg updates