OSX testfixes + test speedup