Bug 865197 - Follow-up 861846 - Unit test fixed and added a new one