artf699662 - Changes in component test and unit test