Fixed all tests but the timing one.