Integration test uncommented and fixes