Small test improvements