Minor tests updates