Code coverage improvement 

Code coverage improvement.
Preview deployer refactoring.