some test improvements