some test improvements from code review