More improvements to tests...