fixes and basic Workspace self-test now passing