Fix test controller