Fix initialization order warning, add some safety margin to test