A bit more test coverage to edition param + some changes from pull request comments.