Fix compiler warning and increase test threshold

Change-Id: If45d81f419bcde612b77ad1b8e088f2db3118680
Merge topic 'minor_test_fix' into master

f704378a Fix compiler warning and increase test threshold