Core-411: rc1
 - added test class
 - tests passes, now let's check on a production environment.