Tests improvements, guarantees