Add back MockServer as a submodule