Fix address of FSF in template blocks and tests