Tests refactored 4.0.2

Tested in IDE and RC environments