Updated Controller Test