Added template and monitoring test