Fixes broken tests
Uneditable field and refactor Foreign Field