Add more notification tests
Remove extra spaces after template execution