updated code for component testing
fixed merge for suo