Wrap up test fixes for #7