Refactorize IntegrationTest
Replace old matrix with the new matrix