Integration tests minor issues fixed