Updated on Mac OS X
Updated on Tests