Clean up for Mac
Fight with Mac tests