Fix various tests on develop on Ubuntu 14.04
Merge pull request #926 from akbargumbira/develop

Fix various tests on develop on Ubuntu 14.04