Small fixes to tests