Split job into two parts
Fixed some integration tests issues