Fix integration tests based on correct positioning