update stub and mock as they were depreciated
update to get tests running
update GOV XML headers