Consolidated baseurl vars
Added some useful func tests