small modifications in tests