Small fixes to test support.