MakoTemplate now, too; test cases