Update tests

This is just a few small changes, please team-review and then :+1: so we can merge.