ticket:4 for #4 fixed tests as per reviewer comments