Some fix to stabilize tests