Minor fixes to tests