changes to make things build under Ubuntu 14. need to change path names for some tests back for mac...