Corrected and retested Test Blocks
Corrected and retested Test Blocks

Template argument names have been corrected
in the Tombeau1Algorithm test code.
Tombeau1 now compiles correctly with test blocks
enabled, but I've commented them out again.

notator/Moritz