A minor modifications for preparing tests