Fix TestController and TestSystem