[case 9017] Updated unit tests