Added tests for the NL activity, start, and end templates.

Also fixed a few bugs that were discovered during testing.