887095 - Fixing test and feedback