Add tests to test not-required uid fields