Test refactoring
Upgrade to 4.0.0.CR4