Work on simplifying MockRestClient further
Move dex to the test library