Some test fixes I worked on over the weekend.

Forgot to commit and push these yesterday