Clean up and add CommonUnitTest