Added a task to the watcher trello card for the former; added some additional `expect` calls to the rename unit test for the latter.