Use entity Create methods instead of Invalid fields; Fix tests

- This helps make the code more semantic and sensible.
- It also helped me fix tests that got broken after the merge with main.