Adjust tests
Set NewImplementation
Reduce NewImplementation