Some updates to get some of the tests working