Refactored integration tests for portability reason