More clean up before unit tests