make some changes for our environment, and rename test functions to make sending to spark easier