Removed/altered some tests because I'm not sold it wasn't the different test metadata I haven't looked for yet that wasn't causing the test failures