Update tests for new generator
Add explicit reserved character list and start debug logging
Updates for new content generator