Tests, TestController, TestIndicator fixes