fixed begin ... end block formatting;
added begin ... end expression autotemplate;
added begin ... end expression autotemplate tests;
cleanup