fixed broken test and using main template