Enhance speedups to deal with numbers more correctly
More tests