Explicitly add org defaults to pedant test
so that it passes, but don't feed the defaults to
the user by default.