Post integration tests fixed