Topic/fix unit tests