- test improvements