Expand test a bit
Attempt to improve algorithms for some operations