Minor tests improvement