[OEM-235] - added more test cases and checks in the view