and making the rest mocking service work again after all that digging