Improved cleanup script
Renamed unit test projects