Moved over test templates
Checking in progress
Support for tag handlers fixed and other commonjs fixes