FIX: Address comments, add darwin test skips some known failures