Fixes for tests under ubuntu 14.04