Small test improvement

Change-Id: I19c7a58f6e48f587092fba3a57c1e41a548bb168