minor changes to get compilation in diff ubuntu
and changing unit test settings