Fix integration tests. Closed #15