Update non-package projects to dotnet 6 + increase testing

[awelburn]

Increase unit test coverage Remove redundant / duplicated code Minor refactorings Should also resolve the outstanding PRs from dependabot

Please let me know if you want to split these into separate PRs