Trivial test improvements