seemingly fixed invalid Term issue, although 1 additional test broke, i think it's for the better