Renew test OK & other tests improved & cleanup & some methods and classes down the chain are modified