Add tests to test not-required uid fields
Merge branch 'master' into Issue29WorkingUsingIf