FITIn: reorganizes external tests, adds better benchmarks