Fix various tests on develop on Ubuntu 14.04