further test improvements