Updated tests based on suggestions in pull request