Port of updated test