Address a number of issues/suggestions

Also added a script to run tests on command line (using xunit runner pulled from nuget)

Feel free to keep/throwaway