Unit test project tweaks
Project reference tweaks