Unit test added for changed classes, rimdsl merge issue fixed and rim cleanup