:ok: my first thought was this should be separate tests, but after further review, this is good.