Some test fixes 1
updates to testing tests 2
More test fixes (hopefully)
remove parallel testing.