Applied the pull request comment changes, e.g. added more nested tests and renamed the test file.