Renamed and update test