test improvements
Tiny improvements