Removed test that didn't test anything.
Refactored some mac code.