Fix neglected tests