updates to get some tests running