Got all tests passing on OSX. case++