TestController improved