removed Template with it's functionality, fixed failing test cases