Started Environment.getTemplate tests
Macro related source code cleanup
Continued Environment.getTemplate tests