Tidied up Net::Curl imports
Updated to use latest tests