Hopefully fix some odd test errors