#4137 Consolidate test projects