Updated tests based on PR#1329 feedback.