Split up Rest and Request unit tests (and retest queries in Rest)