BS-9856
Fix validation
Refactor + unit tests
fix unit tests
Add Mockito Runner for unit test
Fix unit tests for ExpressionHelperTest
Merge remote-tracking branch 'origin/MasterBugFixing' into LivingApp_stab