Fixed my use of the testing macro
Reorganized str-calc directory. Added specs, code using speclj.