Fixed test fails caused by 2.6 warnings
#297

hsbt wants to merge ignore-warnings-2.6 into master

We do not currently have an analysis of these two commits