Changing a couple problematic tests