More unit test clean up