Minor fixes in testing.