Minor fixes to some tests