Misc cleanups

@fosdev Please review and merge!
How about a double expect here where you show the id to show that the id is 'list' or whatever, but the name is self to highlight it is the correct transition.