first modifications of downstream unit tests to cater to new design