- some test improvements