updated test as per review comments