small modifications in test