This is a dev requirement only for tests. Should we change it?