Added tests to demonstrate where a we currently have a problem
Added a todo
Refactored the field tests to surface the same problem
Corrected the new field tests
Refactored _local and _workspace fields to not break stuff