update test as per RP comments