Renamed
fixed integration test issues