Controller Test Changes