Some general test improvements