B-55703 Updated tests per review comments