Fixing templating bug and adding support for explicit codepoints
Removing leftover debug code and adding test cases for arbitrary code points