So could we merge this for now and I'll change the tests in the other PR as discussed?