Test cleanup

Removed lots of unused variables are the test suite complained:

  'warning: assigned but unused variable - cal'

all over the place.

There are still indentation issues with many of tests. But I figured
better to deal with the previous pull request first, then this one
before continuing.