some tests and other minor adjustments
Tidy up the solution file
Minor tweaks for nuget restore