Speedup, tests failing