Add new templates for testing integers
Fix white list check