#13 speed up tests