Test speedup

Down from 16s to 11s.