fixed some template issues with the Unittest template