Controller test modyfication