Updated provider request code and tests