Minor Changes to Facilitate Nunit-Console Jenkins