Fixing unit tests on ubuntu 12.04