[Misc] Remove JUnit deprecations
[Misc] Cleanup
[Misc] Fix TPC breakage + increased TPC