Minor modifications in tests