Upgraded curl-test