refactoring to fix projects fusion. Tests fixed.