mods to make test_workspace work