Tidy up of unit test projects