Minor tests improvements