Topic/add unit tests