more test improvements