Sorry about the reorganized code. All the original testing still happens, but it helped to organize the "happy paths" together. While I was at it, I changed the non-contextual "context"s to "describe".