Test Project reference in solution seems to have been lost in the merge? Strange!