A few minor test updates/fixes after travis ran with python 2.6