some test improvements
more simplifications