HM: Speedup tests