fixed compile issues, ran OSX tests