Fixing more unit tests so they don't crash on validation constraints