Speed up category tests