Fix integration unit tests