Fixed integration tests
Merge branch 'AldwinDelgado'