Fix 67 - Unit tests - Update all unit tests