Test improvements

@ryanstout hopefully can do more of substance soon, but this is a little more of what I started before, maybe more coming.