Topic/add functional tests