Some testing improvements