I can totally do that.  I was doing a quick port-over just now and did that to get it happy and the tests running.  Will move them around in a sec.