Some updates to get tests running