Changes to fix run-tests-ondotnet target , and needed categories added.