Changes to build on os x and increased timeout