trying to get the tests to run, this appears to work, needs further investigation, but out of time today