updated template and added first tests