Update unit-tests to prevent multiple classes with similar names to violate ODR (One Definition Rule)