Train benchmarks and more whitebox tests added