Add target for Mac OS X
Refactor internal method to avoid a reference cycle
Fix project settings
Fix bug causing an async test not to finish if it failed immediately