ticket:1 for #1 as per reviewer directions tests fixed