improvements to calc module

* .wa output cleanup (remove ugly html entities in places)
* add some more test cases