Tests + updates for Darwin