fixed tests for renamed MessageTemplate