Updated tests to address Oliver's comments.