Repush of loader phase with enchanced Unit Tests