Added template and node macros for both compiled and non-comipled node versions.  Added tests for all four macros.